From 6aec79cbaa9835e1ce6c29315d3f4e145eb1dac1 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 2 Feb 2015 09:34:43 +0100 Subject: [PATCH] gtkx: Add support for g_autoptr() https://bugzilla.gnome.org/show_bug.cgi?id=743640 --- gtk/Makefile.am | 1 + gtk/gtkx-autocleanups.h | 27 +++++++++++++++++++++++++++ gtk/gtkx.h | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 gtk/gtkx-autocleanups.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 14a43d0ef4..ed874754d3 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -109,6 +109,7 @@ gtk_public_h_sources = \ gtk.h \ gtk-autocleanups.h \ gtkx.h \ + gtkx-autocleanups.h \ gtk-a11y.h \ gtkaboutdialog.h \ gtkaccelgroup.h \ diff --git a/gtk/gtkx-autocleanups.h b/gtk/gtkx-autocleanups.h new file mode 100644 index 0000000000..3705ff4564 --- /dev/null +++ b/gtk/gtkx-autocleanups.h @@ -0,0 +1,27 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __GI_SCANNER__ + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSocket, g_object_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPlug, g_object_unref) + +#endif diff --git a/gtk/gtkx.h b/gtk/gtkx.h index e5d2531823..f7bce4fef6 100644 --- a/gtk/gtkx.h +++ b/gtk/gtkx.h @@ -29,6 +29,8 @@ #include #include +#include + #undef __GTKX_H_INSIDE__ #endif /* __GTK_X_H__ */ -- 2.30.2